Remove bogus colormap setting.

2000-12-05  Alexander Larsson  <alexl@redhat.com>

	* gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
	Remove bogus colormap setting.

diff --git a/ChangeLog b/ChangeLog
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8d4ccad4404acd2608faad97225cd50c6b68c467..26d16ac05b31aabbd352b5f6b937e368957cb616 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkmain-fb.c (gdk_fb_display_new):
+       Remove bogus colormap setting.
+
 2000-12-05  Alexander Larsson  <alexl@redhat.com>
 
        * gdk/linux-fb/gdkcolor-fb.c:

diff --git a/gdk/linux-fb/gdkmain-fb.c b/gdk/linux-fb/gdkmain-fb.c
index 9e87f06320591aa5f1f0f16d29938f619eb461cd..8a7d258f79e65f574e509434591b4ef3b667ed26 100644 (file)
--- a/gdk/linux-fb/gdkmain-fb.c
+++ b/gdk/linux-fb/gdkmain-fb.c
@@ -471,7 +471,7 @@ gdk_fb_set_mode (GdkFBDisplay *display)
 static GdkFBDisplay *
 gdk_fb_display_new (const char *filename)
 {
-  int fd, n;
+  int fd;
   GdkFBDisplay *retval;
 
   fd = open (filename, O_RDWR);
@@ -498,19 +498,6 @@ gdk_fb_display_new (const char *filename)
                        0);
   g_assert (retval->fbmem != MAP_FAILED);
 
-  
-  if (retval->sinfo.visual == FB_VISUAL_PSEUDOCOLOR)
-    {
-      guint16 red[256], green[256], blue[256];
-      struct fb_cmap cmap;
-      for(n = 0; n < 16; n++)
-       red[n] = green[n] = blue[n] = n << 12;
-      for(n = 16; n < 256; n++)
-       red[n] = green[n] = blue[n] = n << 8;
-      cmap.red = red; cmap.green = green; cmap.blue = blue; cmap.len = 256; cmap.start = 0;
-      ioctl (fd, FBIOPUTCMAP, &cmap);
-    }
-
   if (retval->sinfo.visual == FB_VISUAL_TRUECOLOR)
     {
       retval->red_byte = retval->modeinfo.red.offset >> 3;